adds some starting cli tests
merging files