JENKINS-21149 Added back old tests which are still valid and moved new test to correct test class