Fixed unit tests after correction