Handle tests length bug