Fix tests so that they actually, in fact, work