Refactored unit tests to match workflow control-flow patterns.
Merge remote-tracking branch 'origin/master'