Fix remaining test and add comments

* Fixed the test for the most recent code

Change-Id: I11d09e2807f3071ca39932082dd35f4438b5b380
1 file changed