Remove outdated main-dynamic references
Add missing _ dependency from tests
Insulate from other instances of require