WIP: adding test description
Final refactor on tests