ValueSetDefinition junits/spring fix to services