Test conditions refined or added for tests 6-10 to prevent errors