checkstyle fixed. test cases fixed
all testcases pass