Making tests pass (not finished)