starting on the refactoring of tests