Implemented some missing test cases.