More test cases

from @Shurouq