Merge "Added ClearSystemState in a unit test"