Moved some dependencies away from pip to apt to hopefully speed up installation.
Merge branch 'test-enhancements-more-faster' into test-enhancements