Fixed cluster test configuration. Added omitted cluster tests.