Consolidate creation of type functions, and add tests for remaining types.  Oh, and remove the emptyString type.