Security Fixes
Tests