Dgoodwin/test improvement

Fixes a number of test failures you'll see if you try to run the tests after unsubscribing in the gui. (as this path deletes /etc/pki/entitlement)

Fixed by  using dep injection instead for ent/prod dirs in the problematic locations.

Removed a bunch of ent/prod dir options to cli commands as well. (which was purely for testing)