Fix order of tests, and add identifiers