Removed dead code
Added test for the cluster scenario selector
Added tests for the single-machine view