WIP on tests for spark adaptor and spark adaptor refactor.