Fixed unit tests'