Fixing Converter Bugs & Testing