Merge pull request #763 from afs/test-clean-assert

Clean up use of "assert"