Service now a singleton and separate tests for XML and text.