Make REST urls optional

Updated unit tests for current state, but still need to add all of the
new cases