Merge "Add binary test targets to blueprint_tests phony" into main