Fixed failing tests around agents handling 5 or under emails