Make services private and add basic test for wiring