SCM-759: fixing tests...