Fix tests and style#4

andrewor14 wants to merge 1 commit intotdas:state-cleanuptdas/spark:state-cleanupfrom

andrewor14:cleanupandrewor14/spark:cleanupCopy head branch name to clipboard