[TASK] Changed unit tests in Unit/Service to run standalone on CLI