Check more files in critic target
Clean up some arg processing.
Remove unnecessary quoting
clean up the way we do tests
Cleaning up tests