Slight improvents

Set defaults and fixed bug in a testing function