#2359 testcases adapted and compatibility to old tests improved