[JohnnyEnglish] Fixing timing tracker, fixing some headers, adding more tests