Reworked the test structure