updated unittests
continue to implement 4880 exports and stuff...