fix exporting
Tests finally pass! yay!