Testing script improved & small test added