revamped testing script
cleaned up