Further changes to fix tests on the branch