rebuilding with tests that pass