More tests
Last bit of convert refactor
More tests
More testing; fixing various bugs in convert methods discovered by new tests