Fix kwargs typo
Change bp typo
Unit tests pass, everything has changed