more  tests escpecially for PlainTimestamp + refactoring of tests