Updated tests to remove failed tests
Revert "Updated tests to remove failed tests"

This reverts commit e84688ef0560023973dd870fbc5ba6d6f5b2c6d9.
Refactore ClustuerTest and corrected the tests intended to fail tests to pass