Adjustments to tests and models