#492: add new devices, change tests