Fixed a failing test and added some ToString overrides for internal classes.

Signed-off-by: robhol <email@robhol.net>