CDB-4399 Fix unit tests
CDB-4399 Fix acceptance tests