Fixed failing tests after adding support for FORGE-879.