Move Test files under same folder structure where class is (/includes/)