Add test for #1149

Also enabled another test I stumbled upon disabled