Merge "Add test utilities to simplify writing tests for new tiles" into main