Add better BDD tests