Add tests to prove JENKINS-15826 works