Fix breaking tests due to new argument signature