made more tests pass