Implement some of the TODOs, adding TestCases, TestObjectFactory