fixup extending deprecated functions from Base
clean up test helper code a bit