FORGE-1603: Tests