Fixed unit-test