test: fix broken tests due to recent changes