Merge "Refactor Module connectors for testing"