Restructured the test cases in a BDD style.