Fixes for two failing tests on Jenkins