BUG8446, followup: Add Unit Tests