Started setting up the AddHandler test for a rewrite, and began integrating Mocks using FakeIt.