Initialize w/ keyword arguments.
Fix tests.