test cases now take command line input
Merge origin/master