Removed mock from tests, added quick and dirty logging to cli