Added service test and cleaned up other tests