Fix verbose test output, remove old cruft file