Rest Endpoint tests, other changes