Refactor test suite to be BDD #45