fix system tests and fix an error where we did not pass the correct siteId when saving measurable settings