chore : cleanup test expand

header cleanup
removed "using namespace" in favor of "namespace{}" directive