Add test for SF#588