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

This reverts commit bdaf07e034a756850e5d627c89eeb4c0c15555a2.