Inject the serializer object rather than the service locator
Some little fixes
Updated tests
Updated tests