Fixed several tests
Merge pull request #45 from inspiran/refactor

Fixed several tests