Add test covering what @helgee just fixed