polishing and test changes related to Spark-1.2