Move specs from Controller to services