Merge "Add test cases to increase coverage"