add more tests for PR 548