Cleanup regex and fix testcases to use \t before timestamps