Added more test cases to the framework