Fix travis-specific infinite loop in 3.0

OK, this is ready for merge now.  assertCount() seems to break Travis. :-(