More logging and tests.