Port last two tests