Refactored serializer lookup to allow multiple delegates

Added test for inline serializer option
Oops, copy and paste error