LOOM-1815: All tests pass