Refactor Application mocks