Minor clean-up and more tests.
2 files changed