Removed few test stubs as they are for cli