Merge "Expand MWTimestamp tests"