Add null/nil conversions, refactor Converter, refactor to use rspec 3