Cleanup
Further unit tests
Added ToString overrides to types