Added tests for FORGE-1224