Eng 5105 Fix the export bug and also some test issues