Fixed G6 tests