Remove make default option, fix tests