Make tests pass (outdated tests, no bugs)