Use Timestamp.internal and Timestamp.normal methods to better clarify
which timestamp format is used with which headers.
Use setUp provided Timestamp iters more.
Change-Id: I75b4d2fb946227fb461e8a7512f1d0f9bd3e6d9f
Signed-off-by: Alistair Coles <alistairncoles@gmail.com>