Exceptions updated in endpoint functions

changes to tests, small change to add endpoints (parsing)
Merged master and Temp
Added David Roles update