Fixed unit tests after cespy refactoring