Same changes I made to the BuiltInTester in the other repo I made here