Updated test structure