restructured tests
restructured tests