Added more tests and cluster verification.