Some tests and adjustments.