Added testcase for 422811, slight reorganisation of testcases