rewritting test funcs with new GPP