Added test cases
pre-merge
merge