fix last change to support running from test file