Added several test cases