Fixes for tests to run properly to make sure no functionality breaks