Adjust tests for ac1fd380759ebe9aa3fe42465cd5d38b209c32b5