[LB] cucumber test clean up & rewording