WIP: fix tests to account for the latest changes.
WIP: fix tests