[TASK] Move Service test to Unit scope