Addresses #57 and adds new items to Vocabulary codelist

Also adds the required tests