Update objects to use new Server class
Add tests for toggle and indicator