DEVSUPPORT-1189 - fix all tests and dependencies