Merge branch 'master' into test-enhancements
Used mock library to avoid some time.sleep() calls.
Merge branch 'test-enhancements' into all-the-branches