Better integration testing of CLI