Made tests simpler
Added conversions, definitions, and default defs