Fix Gecko Unit Test Failures

Fixed a couple of unit test failures and also
changed some of the asserts to return better
information in the case of a failure.  It
also seems that the latest version of Gecko 29
works a little better in some cases.

Change-Id: I88a295b2f90de120ee3b24cdd0387a9186693d24