re-org to permit test execution from external entry points