export globally, fix tests