Modularized mocha testing. Cleaned up the patient route.