fix tests, ad new devices