Remove extra base64, fixed tests