Added unit test for #480