Re-factored tests and replaced references from smartics to redhat