More work on all-in-one test script
Updates to test script
Add a lot of dtd-handling options to test script