Put variable assignment in the var_declaration
Component test for AST and SAST
Modified test files
Modified the test bash script
Resolve merge conflicts