Modified builtin function matching expression, disabled some tests that are broken right now.