Updates diversity analysis, tests and etoh
Fixes tests so that everything is tested