399.08 test diagnostics drift - this version appears to work and be worth more rigorous testing