Added more tests and made a minor refactor to conversions.