Re-add diversity e2e test