Remove unwanted stuff
Add unittests for new converter