Adjust tests to work with the changes of commit fae3d1d00dd7e3b23dc813c1cb6ccec1f38c39f7