Merged change_test.go