Test cleanup
Pass service to all the layers