One more test (and a tiny refactor)