Responding to feedback from David and also resolving a namespae collision in tests