More tests pass.