Added service and producer-consumer tests