Address comments from review of PR #171.
Add further tests for new clustering algorithm of bug #155.