Added unit test for #418