More debug logging and more verbose assertion failure (to figure out why the tests are currently failing on travis)