updated service structure, added test configuration