Moving BDD tests over to new modules