Fixing categorical case to use new metrics functions.
Adding testing of categorical variables, reorganizing testing of boolen labels.