BDD, and more test cases