CA-2113 fix unit tests