Final adjustments with tests.