Fixed all the tests except the export