Preparing for 5.x release of bamboo, tests pass integration ones are
stuffed.