Cleanup and fix for brew test failure