swap comparison test modification

Swap test modification - now 7 nearest neighbors of reference cell are
checked. Diagonals get less weight.