Add tests, beginnings of plan parsing