Fixes U4 4767 and adds 2 Tests