Added test and service