More work on domwrap level1 test suite generation. Much cleaner now.