Simplify tests. Add support for long long in Writer.