FAIMS-546 - modify the vocabulary and fix the test