Remove arguably unneeded namespace declaration (STOX-10)
Test improvements (STOX-10)