Enabling IIS variation of the test

Also organizing some test code.