Added few test scripts and some corrections.