Commit refactoring and fixtures update