[FIX] Make the tests work using normanbarbers suggestions