Add beefier testing to cover all requirements.