Refactored unit tests
Moved conversion functions in Converters.