Merge "Revert "Updating pre/post submit tests""