Fixed Parser for functional tests