Add new test and fix old tests.
Add new test and fix old tests.

pvtodorov/indra,johnbachman/belpy,johnbachman/belpy,sorgerlab/indra,johnbachman/belpy,sorgerlab/belpy,johnbachman/indra,bgyori/indra,pvtodorov/indra,johnbachman/indra,sorgerlab/belpy,sorgerlab/indra,johnbachman/indra,sorgerlab/belpy,sorgerlab/indra,bgyori/indra,pvtodorov/indra,pvtodorov/indra,bgyori/indra