Added test files
Merged my includes