add a bunch of new devices
fix expected results