removing my credentials from the test resources, manually merging some commits
merge of message info