Actually run all the tests (and fix the broken ones!)

Change-Id: Iad11e9362b64e067e2d99fa4194a9d309734348b