Add two more tests.
Refactor; avoid double inclusion of <assert.h>
Merge branch 'develop'