Refactoring groups and scenes in endpoint
Add test group and scene (not complete)