Made both tests pass