fixed tests for new suite case picker, and removed unnecessary code