reorganized test structure