Fix and enhance some tests.
11 files changed