FORGE-1802: Added tests