Adds more converters and tests