Moved CLI from test to main