Updating tests, and logging