Allow adding saved devices when coldplugging and add unit tests to verify it all works as expected