Add tests. Fix Parser