Polish @Id tests
Reformat and organize imports