Fixed missing include in unit test.
Enhanced debug output, fixed missing includes.