CFY-1046 clean riemann controller from test code and move it to the policy test yaml