More tests pass