BUG8446, Follow up: Add Unit Tests