Tests and adjustments