Test fixes and encoding is eating my brain.