Added more test cases and also fixed up the creation of the service