One more fix for failing tests