Fixed use namespace::clean
Reorganized tests