Make collection robot tests more reliable.
Pep8.
Merge remote-tracking branch 'origin/master'
Pep8