pull upstream changes to legacy tools tests from server repo