Tests refactored merge

I have tested these scripts in both my local RC environment as well as micro-qa.  All tests have passed.