Add tests to try and flesh out #7547 reporting bug