Remove test code
Add movement event to Entity