SSDM-8343 Cherrypicked the changes test_pybis.py from the branch 19.06.x and added a test fix from Swen.
