Fix some nits from #364
Add a test that Renzo pointed out that we're missing