Module test, hours of frustration
Fix merge conflict in integration_test