Neal Richardson Clean up non-api test fixtures; add Encoding to DESCRIPTION