Fixed unit test coverage.
Included transient dependencies in factory-model, due to the FORGE-980 bug.