changes for suite tests to pass

Incorp more CR suggestions

Incorporated John's CR suggestion and added more tests

BUG=

Review URL: https://chromiumcodereview.appspot.com//11737003