hwaf-worch: sync w/ upstream (81077dd)
test-worch: simpler build procedure