minnor bug fixes
added the few more test and few correction