Add test cases and testing data
Add explicit return value in void return statements