Updated tests to match starting situation