Fixes the nightly build

Fixes two tests that were failingl in the nightly build.