refactoring of tests and fixtures