include improvements
Used existing loader to load includes
Added a test to cover include