moved parts of the matching test around
moved parts of the matching test around

avinasha/joker,avinasha/joker,karottenreibe/joker,karottenreibe/joker,bossmc/joker,EugZol/joker,EugZol/joker,karottenreibe/joker,avinasha/joker,bossmc/joker,bossmc/joker