FORGE-2022: Added tests