Fixing tests from recent master merge