Reorganized Test package