Clean up quality violations in split_test module

Cleans up remaining violations from #2824 except for some outstanding TODOs