Added unittests for service