General revision in some test suites

Code formatting, namespace adjustments etc.