Tidy up FieldValueMutator
Add missing test in event CollectionOfMocks annotation used twice on identical field type
Replace IllegalStateException with assert