Further fixing of tests