Fixing up tests to conform to new implementation.