Reworked detection for rhel6 and unittest2