Bug 16423: (followup) Add more tests