Fix some minor test weirdness (fixes #59)