Device type v2

Fixed the prelaunch tests, there was just a use case missing.

@arikon can you have a look.

@0x1mason you can pull it if you wish.