Explicitely specify kwargs + update tests & docs.