update exports, fix tests