depricate default export & fix tests