Add extra unit tests for diversity