namespace tests adjustments for clarity