Multi-tileset fix + add multi-tileset test