Add test for new behaviour