Fix some broken tests
Merge pull request #17 from niamu/tile_collisions

Fix some broken tests