FIX: Make tests pass again?

Deals with some of the things mentioned in #374. We'll see if this makes Travis happy...