#26 starting to fix tests
#26 fixed all tests