[test] some more test cleanup