Fix Spark Tests