fix test regressions due to signature overhaul