Fix bug with focusing tiled attachment
Fix unit tests/bugs