Last fix for tests