Added custom deserializers for Further unit test consolidation