Fakes refactoring