Modified to new MockEntity