Corrected a small problem with some of the tests.