HOTFIX: Allow PySpark tests to run on Jenkins.

This makes some small changes that allow the PySpark tests to work
correctly on Jenkins.
Removing other tests