Add fixtures and test refactoring