Improved Service Factory
Merge pull request #4 from fontanalorenzo/develop

ModelAwareTrait test