Modified for 4.1
Adding/modifying tests for 4.1
Modifying IAM tests for 4.1
Removing uneeded tests
Merge pull request #1130 from ccassler/tests-refactored-merge

Tests refactored merge