added a beter structure to the tests