Refactored test namespace