test: remove debug stmts
wafcontext: proper consolidation of hlib.Values