Upgrade testing 6.8.8, clean up exclusions