Put tests back in own namespace.