Security issue fixed. Test changes(refractoring). Some unnesccessary methods commented.