Starting adding some test around the services