Tidy up the identify mode/device code a little bit more
Use constants more in the RDM tests