More tests pass better