-Added service tests & completed