src file and include paths fixed
Fixed include files
Removed test