New Test and code correction added