More unit tests, removal of raw name data