added new test cases
corrections and minor additions