Refactored
Merge remote-tracking branch 'origin/robotiumTests' into robotiumTests-norobotiumsource