Fix for better testing support
Files to include