Skiping test for hardware variant bugfix. Comments added for  generic
functions.