Move tests around, more debug stuff