* Apply refresh_node workaround on 1st instance only * Add another test
* Add test for Z-wave switch * Changes for new tests