Initial revision of MessageFactoryReader and supporting tests