added guard question for G5,G6,G7 and fixed tests