Merge changes I25158126,I99fcf77b

* changes:
  TrafficControllerTest - trivial simplification
  simplify bpf tests and check type correctness