An update to keep the original tests and also allow for testing any
optional command line arguments we need to add in future.