Fixing bug in setting of explicitly specified timestamp; fixing tests.