Fix missing "-" in permission string.
Replace assertTrue by assertEquals
Fix test. Delete should happen at the end of the test.
Change date in header.
Load settings per user. Fix test
Merge pull request #1120 from joshmoore/rebased/develop/integration-test-review

Integration test review (rebased onto develop)