All but 1 syntax unit tests working