Many tests passing.  More commits to come with even cleaner code.
add requires of vocabs referenced in the test