REVIEW-5036: tailor error message
REVIEW-5036: give test plugins better names; remove unused code