add positive tests for cluster
merge a branch
add new changes and begining write unit tests