Re: #1311 - tidy / revert test changes