Bug 17640: (QA followup) Add more tests