Changed ast and tests