Use Spark 1.0 rather than the RC for testing (yay)
Make the tests slightly more flexible