Adding monotony test to diversity metrics
Adding a check for uniform distribution
minor refactoring on diversity metrics