testing fixes and security