Made some tests pass