Test should be fixed by commit below.