critical updates for tests