#523: add new devices, change rules and tests