More tests.
Update help formatting.