FORGE-885: Tests failing