added ids for cleanup in testdata, commented out debugging print statements. This should finish out STT-774.