Allow hierarchical injection of endpoints; update test cases