Bug 18837: (follow-up) Add additional tests