add mock service and fix other issue