Added tests and more conversions and validations