Removed single-class test case (all test/train options require 2 classes).
The Mp3DataExtractor's Bitstream does not explicitly close the underlying
FileInputStream object, so this needs to be done.
Other refactoring so code is more readable on laptops (really long lines)