add specific class and tests