Organized test directories
Fixing merge errors