Fixed the problem of test case integration and added a few more test cases.