remove panics in working tests