Merge "Updating pre/post submit tests"