BOOK-595, trying to fix tests, again