Updated tests broken by new reserved words
Restored master implementations of conversion functions