Updated EntityTest and MovableEntityTest to handle the new updated code.