Add code coverage, simplify some code & options.