[1.0] Fix tests on current develop branch