Clean up REST tests

cc @loucach