Modify clustered and throughput test tests, no longer failing

Please review.