FORGE-1459: Added tests