Various Updates

Modifications to test data creation and the final methods we’ll use