fixed tests, all tests pass