A few small backward-compat changes to test helpers