Added test CLI & some error handling