improved test coverage of disjoint multi swap neighbourhood
general test coverage improvements