Yesterday I also refactored the imports in the cats to avoid dot (static) imports, as recommended by the golang team. There were several cases of overlap that are easier to track when using explicit imports. Please update the new diego tests for consistency.