Change test package, fix long encoding + test.