Make all tests pass for now.