r6862: Add some more tests