Got rid of unnecessary test type and debug output.