add TEST0216 class, swap 2 missplaced elements back