improve docstring by adding mappings
revamp tests; pass all
store kwargs