Tweaked pickup and some tilemap tests.