Expand MWTimestamp tests

Change-Id: I00215ecd85b7403a05a75d5eaccbbd2819343624
Merge "Expand MWTimestamp tests"