added parse and removed TestConvert
fixed issues and added tests
fixes