Simplify test namespace naming scheme