Fixed unit test.
Organized make includes.