Improved unittests to test Survey together with ITSM.