More diverse tests