Applying corrections due to tests