Moved testing into the corresponding folder