Add timestamps to transactions
Fix handling of timestamps and tests