Fix a couple of simple mistakes that would prevent the tests from running correctly.
Change the tests to use the new script and enable the test for the doc building.