Minor cleanups to test files (removal of tabs and spaces and importing namespaces rather than using them absolutely).