Added converters and tests.