Use htmlSuite and htmlTest instead of ad hoc solution