Added tests for all handled statements in VariableExpressionReplacer and removed todo comments