Merge "Migrate cli tests to resource_* fixtures"