Tests updated
New parser skeleton ok