Changes to support the integration with hopjs as the new test framework