Fixed some test garbage that slipped into the PR ...