BOOK-595, fixing tests