Switched to billing for diabetic assessments and added tests