Some work done on getting the tests to run more closely to reality
Made things work with the new test framework and dynamicaly loaded classes