reorganise tests a bit, prepare main dialog tests