Refactoring mock lists