Fixed tests for variable/function extraction