Branch 2 3

minor changes increasing comfort of running tests