Better defaults, fixed bad method name and more tests.