fixed tests + parser non static public