Make some tests pass