fixed includes and added test

Fixed includes
Added test
Followed include order coding style