Changed the namespace thing and two macros in unit tests