This fixes tests not being added to the source package.

- Factor out parse_timestamp
- Use `iterkeys`, `itervalues`, `iteritems` and `next` from six
- Use __next__ for Python 3.x and next for Python2.x