More code cleaning
Added a collision layer in the test map

------ TO DO ------
Collision detection