Replacing old test files with new code from qa-automated repo