CB-7829: Is everything working as expected

Testing to see if everything is now finally working away