Merge "Tighten test for warm sim and add more debug." into klp-dev