Removing commented out code
Adding skip to the test that fails because we don't have any code in place to exercise that condition (shuffling the class order)