refactored tests and fixtures