Add integration tests
Remove invitation_helper
Fix conflicts