Tag invalid utf-8 as binary test encoding in 2.0 correctly
Reenable 2.0 testing