Updated tests for changed &REST implementation.