Added new test structure