WIP: Updating tests.