FORGE-1209: Added tests