removing some of the offending steps from the BDD tests