CLC-2709 See if eager-loading will fix tests on bamboo