Fixes for test run