Remove comments in tests.
A more usable way to deal with logging.
Make the argument handling nicer.