[#160] Reorder activity schema to put iati-identifier first

Also updates the tests as appropriate