Correcting tests to fix new code.