Better outputs and update tests.