Corrected package structure
Added tests for ClusterManager