Restructured the tests