Remove some excessive debugging code
Remove some obsolete tests
Fix some tests to deal with equivilant output