Fix a thinko in previous commit & add tests for it