Rearrange tests so they are alphabetic. Add default test. Fix Int64 encoding

We simply coerce the integer value into the right value.