rename tests to make diag come first