started a bdd-like transformation to the unit tests