Closes OICS-736
Closes OICS-727
Closes OICS-737
Closes OICS-738
I could not run the test module against MockIn, but the unit tests passed.