Flatten test namespaces
Merge pull request #660 from rojepp/flatten_test_namespaces

Flatten test namespaces