Changed test structure