Tidy up of converters

Reworked converters (and related tests) to adhere to the Remarks section
of
http://msdn.microsoft.com/en-us/library/system.windows.data.ivalueconverter.convert.aspx