Upgrade the unit testing ABC infrastructure
Merge remote-tracking branch 'origin/master'