Adds a few more tests for dealing with conflicts.

Cleans up some compiler warnings in due to unused variables and
method declarations (TDInternal.h)