Partial cleanup and more tests for Security module
Changelog update