Finised convert method, added tests