Remove privates
Add test for fspointmove event
refactoring