Make REST services consistent - update e2e tests