fix(service): add test plus fix for instant implementation