chore : cleanup test expand

set setupExpandTest as static function
header cleanup
removed "using namespace" in favor of "namespace{}" directive