Added a test for Service and fixed a bug woo