Fixes for failing tests on jenkins