merge conflicts resolved
Checked the remaining routes
Merge pull request #56 from jbwilmoth/diana-tests

Diana tests