refactor for gocheck tests