reworking tests to automate some of the load testing and such
tests mostly rewritten