Actually make the tests pass, too.