Update build and test files to use the new bro-cut