#26 adjustments after testing