Migrate cli tests to resource_* fixtures

Partially-implements bp resource-cleanup

Change-Id: Id1d516948508018e4fa5b36ae7c109a04ee33dcc
Merge "Migrate cli tests to resource_* fixtures"