remove using from headers

Remove using statements from header files.
Change one test for consistency.