Moved a bunch of tests around, cleaned up some tests and fixed issue whe...

...re scripts which were rolled back were still in execution results