Modified the tests to work with the new code.