Refactor: chop out SNZITets and SkipListTests, move around utilities