Fixing tests for v26