ensure builder enforcement test actually looks through entire codebase. Apply fixes to code failing checks
updates due to matcher changes