Cleanup and expand Status tests

Change-Id: Ib06df7196c903505fbc0a3945513c5681acaaff3
Merge "Cleanup and expand Status tests"