Improve wording and add tests for security manager