Revert "Use hierarchical names for unittest (needs tests)"

This should not be in this branch.

This reverts commit 2e6cc1943768eeeeeb0296b8d35cabbeea424a28.