JUDDI-727 reverting a number of changes from the previous commit, they were unnecessary. test case added