Add test cases from bugzilla discussion