fixes for tests on hudson