Fix unit tests and add future parser support