Updated to new MockEntity