Initial Commit
Remove outdated main-dynamic references
Add missing _ dependency from tests