fixed all tests to pass
Merge pull request #4 from zigorou/fixed_tests

Fixed all tests to pass