Start fix export tests