Factory improvements

Added methods for creating charms, services and units to the testing factory.
s/Id/InstanceId/