Removed remaining cfdistro references in tests.