BOOK-595, trying to fix tests, using mixins