Refactors basic bdd, adds use-case