Updated tests to wait for green