Remove unneeded testing data
Get rid of some more bytecount framing stuff, update tests