Mr. Roche changes to Add Test Object Functionality