Make sure all tests are actually run, plus some fixups for things that