Added test cases for variable selection
Fixed variable selection