Moved tests to cli