Add tests for commit e53b0858c32b845482
Remove debugging instrumentation