Merge pull request #1248 from eleuzi01/issue-1234

Clean up constant-flow memsan testing