Updated Test Structure