Added function tests for this branch
Merge branch 'merge_vulnerabilities' into dev