Added test variable
Added test variable2
fixed merge
fixed merge