Added test controller and service