fixing up export tests in-progress