Added test for FORGE-1225