Test suite fix

oops. looks like i've got a previous commit mixed in here. sorry!
can you delete this one?