Fixed unit-tests