default to just test+verify
Merge remote-tracking branch 'upstream/master'