minor changes increasing comfort of running tests for Branch_2_3

minor changes increasing comfort of running tests