refactored large chunks of the test script
refactored large chunks of the test script

nporteschaikin/roots,Leeds-eBooks/roots,smashingboxes/roots,i8ramin/roots,carrot/roots,jescalan/roots,jenius/roots,argyleink/roots,argyleink/roots