Merge Set() and some typo fixes in tests into v1