Updated default and tests