refactored the rest of test cases ... still some remaining !!