Added test structure and some test cases