You're absolutely right. I take credit for writing these terrible tests last year. I've restructured them for this request.