namespace clean-up
test case moving