fixing failing tests and changing end point URIs to avoid conflicts

I have change the new end point URIs to avoid path conflicts with some of the
existing end points in master. Once we merge this branch into master we can
update/change the paths as necessary.