Attempting to fix buggy tests.