initial version for new test approach
Minor changes
Refactored clustering support
Minor changes
removed unused classes
removed unused classes
Added test
removed unused classes
renamed some classes
fixed config