clean and update bdd tests