Use tuples to store conversion data
Add tests for conversions