Minor updates. Added SecurityManagerTest.