Test logging change

Make test_id in more tests be just the numeric value rather than "test#.#"
for consistency with the other tests.