Fixed cucumber step failing
Fix conflicts in patient_cancel_appointment.feature
Improving test coverage, writing more tests and deleting unreacheable code