:white_check_mark: Improve tests for Unit and Service