Bugfix and add additional test.
Not-so-interesting update to clans()
Debugged clans(), added unit test.