Refactor
Fix test failures
Remove the OpenHome from Home class