Fix leftover debug line and new test scheme names