Fixed ee unit tests