Updating tests to reflect the library changes.