Fixing failing tests, and OutOfMemoryError caused by HUGE StringBuilder output from DepMapToString (removed now)