Move tests out of module, into top level dir; Update tests; Fix bug in enumeration where descriptions could not be found by key