updates to rest, smoketest