t6515: more tests.

Quite a few gremlins hidden here.