BOOK-595, trying to fix tests which are failing on travis but not locally