More logical default & fix tests