Fixed unit test for e9534f6625eeae4aae30abffa0b67e418db4ff3c