simplify g.w.t. test a bit
formatting