Added tests for FORGE-1124