Some test calling script
Some stupid bugs fixed