BOOK-596 fixing tests