Add testing xml;
start refactoring Insteon