OH2 Z-Wave refactoring and testing... and SECURITY