Fixing tests
Moving export tests into several files