reorganing Tests