Add 1407 Code Fix Unit Tests