#3: changes to controlled vocabulary has to be also done in models (this was introduced for the test suite -> how to get rid of this again?
