Also collapse background steps if successful

 - and add a missing test