Fixed export unit tests