Added Service, Controller and Service Test