Fix tests due to interface change