Possible fix for tests