fixes for test run