Some tests fixed
Merge pull request #18 from toptierlabs/fix_tests

Some tests fixed