Fixes for tile test