Adding tests to investigate a user reported issue I cannot reproduce