Fix TileMap collisions, woop woop :rainbows:
Merge and fix tests