Skip tests we do not yet have ways to make pass/fail

The DBI itself makes it very hard to make these pass/fail
And tidy
Basic test cleanup

Not done by far, but committed for review