added Security and more test cases