fixed tests
Merge pull request #5 from acltc/fix-tests

fixed tests
resolving merge conflicts