Serialze comparators as strings

Change-Id: I98cfb09e71d5da7602d6534259f200faacd07a59
Fix typo in file name and updated @covers tags

Change-Id: I0a93a8cc0cc0b417cf8fe2b590f9fa68e7f01249