Add test for SF#550
Add test coverage for SF#549