Fixes many of the minor issues with test scripts

Addresses  #4 #5 #7 #10 #11 #12 #14