[Moose-dev] Fixing yellow tests