Add tests for parser
Delete old parser